Rename gtkiconcache.h

The gtkiconcache.h header is private, so rename it to follow the naming
scheme for private headers.

diff --git a/gtk/gtkiconcache.c b/gtk/gtkiconcache.c
index 478efc0e7a240e76367cdef4a7af1f83a55b2621..d4407892f6b64e6ef2673574d839874d830f5375 100644 (file)
--- a/gtk/gtkiconcache.c
+++ b/gtk/gtkiconcache.c
@@ -18,7 +18,7 @@
 #include "config.h"
 
 #include "gtkdebug.h"
-#include "gtkiconcache.h"
+#include "gtkiconcacheprivate.h"
 #include "gtkiconcachevalidator.h"
 
 #include <glib/gstdio.h>

diff --git a/gtk/gtkiconcache.h b/gtk/gtkiconcache.h
deleted file mode 100644 (file)
index da3c95a..0000000
--- a/gtk/gtkiconcache.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* gtkiconcache.h
- * Copyright (C) 2004  Anders Carlsson <andersca@gnome.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef __GTK_ICON_CACHE_H__
-#define __GTK_ICON_CACHE_H__
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk/gdk.h>
-
-typedef struct _GtkIconCache GtkIconCache;
-
-GtkIconCache *_gtk_icon_cache_new            (const gchar  *data);
-GtkIconCache *_gtk_icon_cache_new_for_path   (const gchar  *path);
-gint          _gtk_icon_cache_get_directory_index  (GtkIconCache *cache,
-                                                   const gchar  *directory);
-gboolean      _gtk_icon_cache_has_icon       (GtkIconCache *cache,
-                                             const gchar  *icon_name);
-gboolean      _gtk_icon_cache_has_icon_in_directory (GtkIconCache *cache,
-                                                    const gchar  *icon_name,
-                                                    const gchar  *directory);
-gboolean      _gtk_icon_cache_has_icons      (GtkIconCache *cache,
-                                              const gchar  *directory);
-void         _gtk_icon_cache_add_icons      (GtkIconCache *cache,
-                                             const gchar  *directory,
-                                             GHashTable   *hash_table);
-
-gint          _gtk_icon_cache_get_icon_flags (GtkIconCache *cache,
-                                             const gchar  *icon_name,
-                                             gint          directory_index);
-GdkPixbuf    *_gtk_icon_cache_get_icon       (GtkIconCache *cache,
-                                             const gchar  *icon_name,
-                                             gint          directory_index);
-
-GtkIconCache *_gtk_icon_cache_ref            (GtkIconCache *cache);
-void          _gtk_icon_cache_unref          (GtkIconCache *cache);
-
-
-#endif /* __GTK_ICON_CACHE_H__ */

diff --git a/gtk/gtkiconcacheprivate.h b/gtk/gtkiconcacheprivate.h
new file mode 100644 (file)
index 0000000..da3c95a
--- /dev/null
+++ b/gtk/gtkiconcacheprivate.h
@@ -0,0 +1,51 @@
+/* gtkiconcache.h
+ * Copyright (C) 2004  Anders Carlsson <andersca@gnome.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef __GTK_ICON_CACHE_H__
+#define __GTK_ICON_CACHE_H__
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gdk/gdk.h>
+
+typedef struct _GtkIconCache GtkIconCache;
+
+GtkIconCache *_gtk_icon_cache_new            (const gchar  *data);
+GtkIconCache *_gtk_icon_cache_new_for_path   (const gchar  *path);
+gint          _gtk_icon_cache_get_directory_index  (GtkIconCache *cache,
+                                                   const gchar  *directory);
+gboolean      _gtk_icon_cache_has_icon       (GtkIconCache *cache,
+                                             const gchar  *icon_name);
+gboolean      _gtk_icon_cache_has_icon_in_directory (GtkIconCache *cache,
+                                                    const gchar  *icon_name,
+                                                    const gchar  *directory);
+gboolean      _gtk_icon_cache_has_icons      (GtkIconCache *cache,
+                                              const gchar  *directory);
+void         _gtk_icon_cache_add_icons      (GtkIconCache *cache,
+                                             const gchar  *directory,
+                                             GHashTable   *hash_table);
+
+gint          _gtk_icon_cache_get_icon_flags (GtkIconCache *cache,
+                                             const gchar  *icon_name,
+                                             gint          directory_index);
+GdkPixbuf    *_gtk_icon_cache_get_icon       (GtkIconCache *cache,
+                                             const gchar  *icon_name,
+                                             gint          directory_index);
+
+GtkIconCache *_gtk_icon_cache_ref            (GtkIconCache *cache);
+void          _gtk_icon_cache_unref          (GtkIconCache *cache);
+
+
+#endif /* __GTK_ICON_CACHE_H__ */

diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index fe070466606a55fed65863deeba6d3b9043dc95b..0ce3a21146ad9fe6447f903e7fc40fa4194e9a95 100644 (file)
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -41,7 +41,7 @@
 #include "gtkcsspalettevalueprivate.h"
 #include "gtkcssrgbavalueprivate.h"
 #include "gtkdebug.h"
-#include "gtkiconcache.h"
+#include "gtkiconcacheprivate.h"
 #include "gtkintl.h"
 #include "gtkmain.h"
 #include "gtksettingsprivate.h"